Merge.
authorSteven Smith <ssmith@xensource.com>
Fri, 1 Dec 2006 12:03:38 +0000 (12:03 +0000)
committerSteven Smith <ssmith@xensource.com>
Fri, 1 Dec 2006 12:03:38 +0000 (12:03 +0000)
1  2 
tools/python/xen/xend/image.py

Simple merge